Link the gnome-shell binary to libgnome-shell-js.so

Depending on the exact linker options and versions, rpath's written
into the binary may, or may not, be honored by dlopen(). Work around
this by simply linking the gnome-shell binary to gnome-shell-js, since
then dlopen() doesn't need to search paths.

https://bugzilla.gnome.org/show_bug.cgi?id=670477

diff --git a/src/Makefile.am b/src/Makefile.am
index 981a16d4bdaaabfa51d6aa29f9fd2e86e68c2ad9..dc5137e34fabc4615cde2b7df5eca8aa91e78fa3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,7 +193,7 @@ libgnome_shell_la_gir_sources = \
 gnome_shell_real_SOURCES =             \
        main.c
 gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
-gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
+gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
 gnome_shell_real_DEPENDENCIES = libgnome-shell.la
 
 EXTRA_DIST += test-gapplication.js